From 72d584389835b1f7de3dafd6b0fb0497c63646e3 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 10 Feb 1999 00:21:09 +0000 Subject: [PATCH] If we can't find helvetica, fall back to "fixed". If we can't find Tue Feb 9 19:11:43 1999 Owen Taylor * gtk/gtkstyle.c (gtk_style_new): If we can't find helvetica, fall back to "fixed". If we can't find "fixed", exit cleanly. --- ChangeLog | 13 +++++++++++++ ChangeLog.pre-2-0 | 13 +++++++++++++ ChangeLog.pre-2-10 | 13 +++++++++++++ ChangeLog.pre-2-2 | 13 +++++++++++++ ChangeLog.pre-2-4 | 13 +++++++++++++ ChangeLog.pre-2-6 | 13 +++++++++++++ ChangeLog.pre-2-8 | 13 +++++++++++++ acconfig.h | 6 ++---- configure.in | 5 +++-- gdk/gdkevents.c | 2 +- gdk/gdkim.c | 13 +++++++------ gdk/x11/gdkevents-x11.c | 2 +- gdk/x11/gdkim-x11.c | 13 +++++++------ gtk/gtkstyle.c | 10 ++++++++-- 14 files changed, 120 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ef146b595..ae35e800c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Tue Feb 9 19:11:43 1999 Owen Taylor + + * gtk/gtkstyle.c (gtk_style_new): If we can't find + helvetica, fall back to "fixed". If we can't + find "fixed", exit cleanly. + +Tue Feb 9 16:03:44 1999 Owen Taylor + + * acconfig.h configure.in: Rename + XIM_INST_IS_MISSING_OR_STRANGE to USE_X11R6_XIM + + * Conditionalize destroy callbacks with USE_X11R6_XIM. + Tue Feb 9 15:35:13 1999 Owen Taylor * gtk/gtklabel.c (gtk_label_style_set): Added diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7ef146b595..ae35e800c6 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,16 @@ +Tue Feb 9 19:11:43 1999 Owen Taylor + + * gtk/gtkstyle.c (gtk_style_new): If we can't find + helvetica, fall back to "fixed". If we can't + find "fixed", exit cleanly. + +Tue Feb 9 16:03:44 1999 Owen Taylor + + * acconfig.h configure.in: Rename + XIM_INST_IS_MISSING_OR_STRANGE to USE_X11R6_XIM + + * Conditionalize destroy callbacks with USE_X11R6_XIM. + Tue Feb 9 15:35:13 1999 Owen Taylor * gtk/gtklabel.c (gtk_label_style_set): Added diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7ef146b595..ae35e800c6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,16 @@ +Tue Feb 9 19:11:43 1999 Owen Taylor + + * gtk/gtkstyle.c (gtk_style_new): If we can't find + helvetica, fall back to "fixed". If we can't + find "fixed", exit cleanly. + +Tue Feb 9 16:03:44 1999 Owen Taylor + + * acconfig.h configure.in: Rename + XIM_INST_IS_MISSING_OR_STRANGE to USE_X11R6_XIM + + * Conditionalize destroy callbacks with USE_X11R6_XIM. + Tue Feb 9 15:35:13 1999 Owen Taylor * gtk/gtklabel.c (gtk_label_style_set): Added diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7ef146b595..ae35e800c6 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,16 @@ +Tue Feb 9 19:11:43 1999 Owen Taylor + + * gtk/gtkstyle.c (gtk_style_new): If we can't find + helvetica, fall back to "fixed". If we can't + find "fixed", exit cleanly. + +Tue Feb 9 16:03:44 1999 Owen Taylor + + * acconfig.h configure.in: Rename + XIM_INST_IS_MISSING_OR_STRANGE to USE_X11R6_XIM + + * Conditionalize destroy callbacks with USE_X11R6_XIM. + Tue Feb 9 15:35:13 1999 Owen Taylor * gtk/gtklabel.c (gtk_label_style_set): Added diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7ef146b595..ae35e800c6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,16 @@ +Tue Feb 9 19:11:43 1999 Owen Taylor + + * gtk/gtkstyle.c (gtk_style_new): If we can't find + helvetica, fall back to "fixed". If we can't + find "fixed", exit cleanly. + +Tue Feb 9 16:03:44 1999 Owen Taylor + + * acconfig.h configure.in: Rename + XIM_INST_IS_MISSING_OR_STRANGE to USE_X11R6_XIM + + * Conditionalize destroy callbacks with USE_X11R6_XIM. + Tue Feb 9 15:35:13 1999 Owen Taylor * gtk/gtklabel.c (gtk_label_style_set): Added diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7ef146b595..ae35e800c6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,16 @@ +Tue Feb 9 19:11:43 1999 Owen Taylor + + * gtk/gtkstyle.c (gtk_style_new): If we can't find + helvetica, fall back to "fixed". If we can't + find "fixed", exit cleanly. + +Tue Feb 9 16:03:44 1999 Owen Taylor + + * acconfig.h configure.in: Rename + XIM_INST_IS_MISSING_OR_STRANGE to USE_X11R6_XIM + + * Conditionalize destroy callbacks with USE_X11R6_XIM. + Tue Feb 9 15:35:13 1999 Owen Taylor * gtk/gtklabel.c (gtk_label_style_set): Added diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7ef146b595..ae35e800c6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,16 @@ +Tue Feb 9 19:11:43 1999 Owen Taylor + + * gtk/gtkstyle.c (gtk_style_new): If we can't find + helvetica, fall back to "fixed". If we can't + find "fixed", exit cleanly. + +Tue Feb 9 16:03:44 1999 Owen Taylor + + * acconfig.h configure.in: Rename + XIM_INST_IS_MISSING_OR_STRANGE to USE_X11R6_XIM + + * Conditionalize destroy callbacks with USE_X11R6_XIM. + Tue Feb 9 15:35:13 1999 Owen Taylor * gtk/gtklabel.c (gtk_label_style_set): Added diff --git a/acconfig.h b/acconfig.h index 6142aa465f..b6cb32d37f 100644 --- a/acconfig.h +++ b/acconfig.h @@ -35,10 +35,8 @@ #undef RESOURCE_BASE -/* Define to enable POSIX threading awareness */ -#undef USE_PTHREADS - -#undef XIM_INST_IS_MISSING_OR_STRANGE +/* Define to use X11R6 additions to XIM */ +#undef USE_X11R6_XIM #undef XINPUT_NONE #undef XINPUT_GXI diff --git a/configure.in b/configure.in index 0d2ec29f83..2c8bfa4180 100644 --- a/configure.in +++ b/configure.in @@ -328,9 +328,10 @@ if test x$enable_xim_inst = xmaybe ; then fi if test "x$enable_xim" = "xyes"; then + AC_DEFINE(USE_XIM) GTK_XIM_FLAGS="-DUSE_XIM" - if test "x$enable_xim_inst" = "xno"; then - AC_DEFINE(XIM_INST_IS_MISSING_OR_STRANGE) + if test "x$enable_xim_inst" = "xyes"; then + AC_DEFINE(USE_X11R6_XIM) fi fi diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index e83b05086f..3ac781aac8 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -1955,7 +1955,7 @@ gdk_events_queue (void) while (!gdk_event_queue_find_first() && XPending (gdk_display)) { - #ifdef USE_XIM +#ifdef USE_XIM Window w = None; XNextEvent (gdk_display, &xevent); diff --git a/gdk/gdkim.c b/gdk/gdkim.c index 1d83399743..6451529f78 100644 --- a/gdk/gdkim.c +++ b/gdk/gdkim.c @@ -54,7 +54,7 @@ typedef struct { gpointer value; } GdkImArg; -#ifndef XIM_INST_IS_MISSING_OR_STRANGE +#ifdef USE_X11R6_XIM static void gdk_im_instantiate_cb (Display *display, XPointer client_data, XPointer call_data); @@ -318,6 +318,7 @@ gdk_im_set_best_style (GdkIMStyle style) return xim_best_allowed_style; } +#ifdef USE_X11R6_XIM static void gdk_im_destroy_cb (XIM im, XPointer client_data, XPointer call_data) { @@ -340,13 +341,10 @@ gdk_im_destroy_cb (XIM im, XPointer client_data, XPointer call_data) private->xic = NULL; } -#ifndef XIM_INST_IS_MISSING_OR_STRANGE XRegisterIMInstantiateCallback (gdk_display, NULL, NULL, NULL, gdk_im_instantiate_cb, NULL); -#endif } -#ifndef XIM_INST_IS_MISSING_OR_STRANGE static void gdk_im_instantiate_cb (Display *display, XPointer client_data, XPointer call_data) @@ -366,7 +364,6 @@ gdk_im_instantiate_cb (Display *display, static gint gdk_im_real_open (void) { - XIMCallback destroy_cb; GList *node; xim_im = XOpenIM (GDK_DISPLAY(), NULL, NULL, NULL); @@ -377,10 +374,14 @@ gdk_im_real_open (void) } else { +#ifdef USE_X11R6_XIM + XIMCallback destroy_cb; + destroy_cb.callback = gdk_im_destroy_cb; destroy_cb.client_data = NULL; if (NULL != XSetIMValues (xim_im, XNDestroyCallback, &destroy_cb, NULL)) GDK_NOTE (XIM, g_warning ("Could not set destroy callback to IM. Be careful to not destroy your input method.")); +#endif XGetIMValues (xim_im, XNQueryInputStyle, &xim_styles, NULL, NULL); @@ -411,7 +412,7 @@ gdk_im_open (void) if (gdk_im_real_open ()) return TRUE; -#ifndef XIM_INST_IS_MISSING_OR_STRANGE +#ifdef USE_X11R6_XIM XRegisterIMInstantiateCallback (gdk_display, NULL, NULL, NULL, gdk_im_instantiate_cb, NULL); #endif diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c index e83b05086f..3ac781aac8 100644 --- a/gdk/x11/gdkevents-x11.c +++ b/gdk/x11/gdkevents-x11.c @@ -1955,7 +1955,7 @@ gdk_events_queue (void) while (!gdk_event_queue_find_first() && XPending (gdk_display)) { - #ifdef USE_XIM +#ifdef USE_XIM Window w = None; XNextEvent (gdk_display, &xevent); diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c index 1d83399743..6451529f78 100644 --- a/gdk/x11/gdkim-x11.c +++ b/gdk/x11/gdkim-x11.c @@ -54,7 +54,7 @@ typedef struct { gpointer value; } GdkImArg; -#ifndef XIM_INST_IS_MISSING_OR_STRANGE +#ifdef USE_X11R6_XIM static void gdk_im_instantiate_cb (Display *display, XPointer client_data, XPointer call_data); @@ -318,6 +318,7 @@ gdk_im_set_best_style (GdkIMStyle style) return xim_best_allowed_style; } +#ifdef USE_X11R6_XIM static void gdk_im_destroy_cb (XIM im, XPointer client_data, XPointer call_data) { @@ -340,13 +341,10 @@ gdk_im_destroy_cb (XIM im, XPointer client_data, XPointer call_data) private->xic = NULL; } -#ifndef XIM_INST_IS_MISSING_OR_STRANGE XRegisterIMInstantiateCallback (gdk_display, NULL, NULL, NULL, gdk_im_instantiate_cb, NULL); -#endif } -#ifndef XIM_INST_IS_MISSING_OR_STRANGE static void gdk_im_instantiate_cb (Display *display, XPointer client_data, XPointer call_data) @@ -366,7 +364,6 @@ gdk_im_instantiate_cb (Display *display, static gint gdk_im_real_open (void) { - XIMCallback destroy_cb; GList *node; xim_im = XOpenIM (GDK_DISPLAY(), NULL, NULL, NULL); @@ -377,10 +374,14 @@ gdk_im_real_open (void) } else { +#ifdef USE_X11R6_XIM + XIMCallback destroy_cb; + destroy_cb.callback = gdk_im_destroy_cb; destroy_cb.client_data = NULL; if (NULL != XSetIMValues (xim_im, XNDestroyCallback, &destroy_cb, NULL)) GDK_NOTE (XIM, g_warning ("Could not set destroy callback to IM. Be careful to not destroy your input method.")); +#endif XGetIMValues (xim_im, XNQueryInputStyle, &xim_styles, NULL, NULL); @@ -411,7 +412,7 @@ gdk_im_open (void) if (gdk_im_real_open ()) return TRUE; -#ifndef XIM_INST_IS_MISSING_OR_STRANGE +#ifdef USE_X11R6_XIM XRegisterIMInstantiateCallback (gdk_display, NULL, NULL, NULL, gdk_im_instantiate_cb, NULL); #endif diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 097d68c237..8090325d93 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -396,8 +396,14 @@ gtk_style_new (void) style = g_new0 (GtkStyle, 1); if (!default_font) - default_font = - gdk_font_load ("-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*"); + { + default_font = + gdk_font_load ("-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*"); + if (!default_font) + default_font = gdk_font_load ("fixed"); + if (!default_font) + g_error ("Unable to load default font."); + } style->font = default_font; gdk_font_ref (style->font); -- 2.30.2